Remove unnecessary call to gdk_image_new_bitmap().

Thu Sep 20 16:20:47 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary
	call to gdk_image_new_bitmap().

diff --git a/ChangeLog b/ChangeLog
index b8f4b4d3e127490c58746394dd2878e4eeb0f48a..55dd7b595d0e5aa9db48a066f6cb288bc26c443c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 20 16:20:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary
+       call to gdk_image_new_bitmap().
+
 Thu Sep 20 15:31:35 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_init): Use the current

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b8f4b4d3e127490c58746394dd2878e4eeb0f48a..55dd7b595d0e5aa9db48a066f6cb288bc26c443c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu Sep 20 16:20:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary
+       call to gdk_image_new_bitmap().
+
 Thu Sep 20 15:31:35 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_init): Use the current

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b8f4b4d3e127490c58746394dd2878e4eeb0f48a..55dd7b595d0e5aa9db48a066f6cb288bc26c443c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Sep 20 16:20:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary
+       call to gdk_image_new_bitmap().
+
 Thu Sep 20 15:31:35 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_init): Use the current

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b8f4b4d3e127490c58746394dd2878e4eeb0f48a..55dd7b595d0e5aa9db48a066f6cb288bc26c443c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Sep 20 16:20:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary
+       call to gdk_image_new_bitmap().
+
 Thu Sep 20 15:31:35 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_init): Use the current

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b8f4b4d3e127490c58746394dd2878e4eeb0f48a..55dd7b595d0e5aa9db48a066f6cb288bc26c443c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Sep 20 16:20:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary
+       call to gdk_image_new_bitmap().
+
 Thu Sep 20 15:31:35 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_init): Use the current

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b8f4b4d3e127490c58746394dd2878e4eeb0f48a..55dd7b595d0e5aa9db48a066f6cb288bc26c443c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Sep 20 16:20:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary
+       call to gdk_image_new_bitmap().
+
 Thu Sep 20 15:31:35 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_init): Use the current

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b8f4b4d3e127490c58746394dd2878e4eeb0f48a..55dd7b595d0e5aa9db48a066f6cb288bc26c443c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Sep 20 16:20:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkrgb.c (gdk_rgb_allocate_images): Remove unnecessary
+       call to gdk_image_new_bitmap().
+
 Thu Sep 20 15:31:35 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_init): Use the current

diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index bedce4067c54c3aa4d58279d2760b6bd50b8e2d9..4c178b217576105757d18654a54e4f82d3ccdd1b 100644 (file)
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -615,15 +615,9 @@ gdk_rgb_allocate_images (GdkRgbInfo *image_info,
   
   for (i = 0; i < n_images; i++)
     {
-      if (image_info->bitmap)
-       /* Use malloc() instead of g_malloc since X will free() this mem */
-       image_info->static_image[i] = gdk_image_new_bitmap (image_info->visual,
-                                                           (gpointer) malloc (REGION_WIDTH * REGION_HEIGHT >> 3),
-                                                           REGION_WIDTH * (N_REGIONS / n_images), REGION_HEIGHT);
-      else
-       image_info->static_image[i] = gdk_image_new (shared ? GDK_IMAGE_SHARED : GDK_IMAGE_NORMAL,
-                                                    image_info->visual,
-                                                    REGION_WIDTH * (N_REGIONS / n_images), REGION_HEIGHT);
+      image_info->static_image[i] = gdk_image_new (shared ? GDK_IMAGE_SHARED : GDK_IMAGE_NORMAL,
+                                                  image_info->visual,
+                                                  REGION_WIDTH * (N_REGIONS / n_images), REGION_HEIGHT);
 
       if (!image_info->static_image[i])
        {